271. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:05 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

271.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Wishlist/web/css/source_module.less2016-11-22 12:22:26 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Wishlist/web/css/source_module.less2021-04-28 13:37:00 +0000

271.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged3682
Changed12
Inserted11
Removed00

271.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

271.4 Active regular expressions

No regular expressions were active.

271.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Common 7 //  Common
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11     .form.wishlist.items { 11     .form.wishlist.items {
12         .actions-toolbar { 12         .actions-toolbar {
13             &:extend(.abs-reset-left-margin all); 13             &:extend(.abs-reset-left-margin all);
14         } 14         }
15     } 15     }
16  16     .form-wishlist-items {padding-bottom: 30px;}
17     .product-social-links, 17     .product-social-links,
18     .product-addto-links, 18     .product-addto-links,
19     .block-bundle-summary, 19     .block-bundle-summary,
20     .product-item, 20     .product-item,
21     .table-comparison { 21     .table-comparison {
22         .action.towishlist { 22         .action.towishlist {
23             &:extend(.abs-actions-addto all); 23             &:extend(.abs-actions-addto all);
24             .lib-icon-font-symbol( 24             .lib-icon-font-symbol(
25             @_icon-font-content: @icon-wishlist-full, 25             @_icon-font-content: @icon-wishlist-full,
26             @_icon-font-position: before 26             @_icon-font-position: before
27             ); 27             );
28         } 28         }
29     } 29     }
30  30 
31     .account .table-wrapper .data.table.wishlist { 31     .account .table-wrapper .data.table.wishlist {
32         .lib-table-bordered( 32         .lib-table-bordered(
33         @_table_type: horizontal 33         @_table_type: horizontal
34         ); 34         );
35         thead > tr > th { 35         thead > tr > th {
36             border-bottom: 0; 36             border-bottom: 0;
37         } 37         }
38         tbody > tr:last-child > td { 38         tbody > tr:last-child > td {
39             border-bottom: 1px solid @table__border-color; 39             border-bottom: 1px solid @table__border-color;
40         } 40         }
41         .product.name { 41         .product.name {
42             display: inline-block; 42             display: inline-block;
43             margin-bottom: @indent__s; 43             margin-bottom: @indent__s;
44         } 44         }
45         .box-tocart { 45         .box-tocart {
46             margin: @indent__s 0; 46             margin: @indent__s 0;
47             .qty { 47             .qty {
48                 vertical-align: middle; 48                 vertical-align: middle;
49                 &:extend(.abs-input-qty all); 49                 &:extend(.abs-input-qty all);
50             } 50             }
51         } 51         }
52         .col { 52         .col {
53             &.item { 53             &.item {
54                 width: 50%; 54                 width: 50%;
55             } 55             }
56             &.photo { 56             &.photo {
57                 max-width: 150px; 57                 max-width: 150px;
58             } 58             }
59             &.selector { 59             &.selector {
60                 max-width: 15px; 60                 max-width: 15px;
61             } 61             }
62         } 62         }
63         textarea { 63         textarea {
64             margin: @indent__s 0; 64             margin: @indent__s 0;
65         } 65         }
66         .input-text.qty { 66         .input-text.qty {
67             margin-bottom: @indent__s; 67             margin-bottom: @indent__s;
68         } 68         }
69         .action.primary { 69         .action.primary {
70             vertical-align: top; 70             vertical-align: top;
71         } 71         }
72         .price { 72         .price {
73             font-weight: @font-weight__bold; 73             font-weight: @font-weight__bold;
74         } 74         }
75     } 75     }
76  76 
77     .link.wishlist { 77     .link.wishlist {
78         .counter { 78         .counter {
79             .lib-css(color, @text__color__muted); 79             .lib-css(color, @text__color__muted);
80             white-space: nowrap; 80             white-space: nowrap;
81             &:before { 81             &:before {
82                 content: '('; 82                 content: '(';
83             } 83             }
84             &:after { 84             &:after {
85                 content: ')'; 85                 content: ')';
86             } 86             }
87         } 87         }
88     } 88     }
89  89 
90     .block-wishlist { 90     .block-wishlist {
91         .block-title { 91         .block-title {
92             &:extend(.abs-block-widget-title all); 92             &:extend(.abs-block-widget-title all);
93         } 93         }
94         .counter { 94         .counter {
95             &:extend(.abs-block-items-counter all); 95             &:extend(.abs-block-items-counter all);
96         } 96         }
97         .product-item-name { 97         .product-item-name {
98             margin-right: @indent__m; 98             margin-right: @indent__m;
99         } 99         }
100     } 100     }
101  101 
102     .products-grid.wishlist { 102     .products-grid.wishlist {
103         .product { 103         .product {
104             &-item { 104             &-item {
105                 &-photo { 105                 &-photo {
106                     display: block; 106                     display: block;
107                     margin-bottom: @indent__s; 107                     margin-bottom: @indent__s;
108                 } 108                 }
109                 &-name { 109                 &-name {
110                     margin-top: 0; 110                     margin-top: 0;
111                 } 111                 }
112                 .price-box { 112                 .price-box {
113                     margin: 0; 113                     margin: 0;
114                 } 114                 }
115                 .comment-box { 115                 .comment-box {
116                     .label { 116                     .label {
117                         &:extend(.abs-visually-hidden all); 117                         &:extend(.abs-visually-hidden all);
118                     } 118                     }
119                 } 119                 }
120                 &-comment { 120                 &-comment {
121                     display: block; 121                     display: block;
122                     height: 42px; 122                     height: 42px;
123                     margin: @indent__s 0; 123                     margin: @indent__s 0;
124                 } 124                 }
125                 &-actions { 125                 &-actions {
126                     > * { 126                     > * {
127                         margin-right: 15px; 127                         margin-right: 15px;
128                         &:last-child { 128                         &:last-child {
129                             margin-right: 0; 129                             margin-right: 0;
130                         } 130                         }
131                     } 131                     }
132                 } 132                 }
133                 .box-tocart { 133                 .box-tocart {
134                     input.qty { 134                     input.qty {
135                         &:extend(.abs-input-qty all); 135                         &:extend(.abs-input-qty all);
136                     } 136                     }
137                     .tocart { 137                     .tocart {
138                         &:extend(.abs-revert-secondary-size all); 138                         &:extend(.abs-revert-secondary-size all);
139                     } 139                     }
140                 } 140                 }
    141                 .qty.field .control {width: 45px;}
141             } 142             }
142         } 143         }
143     } 144     }
144 } 145 }
145  146 
146 // 147 //
147 //  Mobile 148 //  Mobile
148 //  _____________________________________________ 149 //  _____________________________________________
149  150 
150 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 151 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
151     .products-grid.wishlist { 152     .products-grid.wishlist {
152         .product-item { 153         .product-item {
153             border-bottom: 1px solid @secondary__color; 154             border-bottom: 1px solid @secondary__color;
154             &:first-child { 155             &:first-child {
155                 border-top: 1px solid @secondary__color; 156                 border-top: 1px solid @secondary__color;
156             } 157             }
157         } 158         }
158     } 159     }
159 } 160 }
160  161 
161 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 162 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
162     .products-grid.wishlist { 163     .products-grid.wishlist {
163         margin-bottom: @indent__l; 164         margin-bottom: @indent__l;
164         margin-right: -@indent__s; 165         margin-right: -@indent__s;
165         .product { 166         .product {
166             &-item { 167             &-item {
167                 padding: @indent__base @indent__s @indent__base @indent__base; 168                 padding: @indent__base @indent__s @indent__base @indent__base;
168                 position: relative; 169                 position: relative;
169                 &-photo { 170                 &-photo {
170                     float: left; 171                     float: left;
171                     margin-right: @indent__base; 172                     margin-right: @indent__base;
172                 } 173                 }
173                 &-name { 174                 &-name {
174                     .lib-font-size(16); 175                     .lib-font-size(16);
175                 } 176                 }
176                 &-actions { 177                 &-actions {
177                     display: block; 178                     display: block;
178                     .action { 179                     .action {
179                         margin-right: 15px; 180                         margin-right: 15px;
180                         &:last-child { 181                         &:last-child {
181                             margin-right: 0; 182                             margin-right: 0;
182                         } 183                         }
183                         &.edit { 184                         &.edit {
184                             float: left; 185                             float: left;
185                         } 186                         }
186                         &.delete { 187                         &.delete {
187                             float: right; 188                             float: right;
188                         } 189                         }
189                         &.edit, 190                         &.edit,
190                         &.delete { 191                         &.delete {
191                             margin-top: 7px; 192                             margin-top: 7px;
192                         } 193                         }
193                     } 194                     }
194                 } 195                 }
195                 &-name, 196                 &-name,
196                 &-description, 197                 &-description,
197                 .price-box, 198                 .price-box,
198                 &-tooltip { 199                 &-tooltip {
199                     margin-left: 95px; 200                     margin-left: 95px;
200                 } 201                 }
201                 .box-tocart { 202                 .box-tocart {
202                     float: left; 203                     float: left;
203                     margin-right: @indent__base; 204                     margin-right: @indent__base;
204                     .stock { 205                     .stock {
205                         margin-top: 7px; 206                         margin-top: 7px;
206                     } 207                     }
207                 } 208                 }
208                 .giftregisty-dropdown, 209                 .giftregisty-dropdown,
209                 .field.qty { 210                 .field.qty {
210                     display: none; 211                     display: none;
211                 } 212                 }
212             } 213             }
213             &-image-container { 214             &-image-container {
214                 max-width: 80px; 215                 max-width: 80px;
215             } 216             }
216         } 217         }
217     } 218     }
218  219 
219     .wishlist-index-index { 220     .wishlist-index-index {
220         .product { 221         .product {
221             &-item { 222             &-item {
222                 width: 100%; 223                 width: 100%;
223                 &-info { 224                 &-info {
224                     width: auto; 225                     width: auto;
225                 } 226                 }
226             } 227             }
227         } 228         }
228     } 229     }
229  230 
230     .cart.table-wrapper { 231     .cart.table-wrapper {
231         .action-towishlist { 232         .action-towishlist {
232             .lib-icon-font( 233             .lib-icon-font(
233             @icon-wishlist-full, 234             @icon-wishlist-full,
234             @_icon-font-size: 18px, 235             @_icon-font-size: 18px,
235             @_icon-font-line-height: 20px, 236             @_icon-font-line-height: 20px,
236             @_icon-font-text-hide: true, 237             @_icon-font-text-hide: true,
237             @_icon-font-color: @minicart-icons-color, 238             @_icon-font-color: @minicart-icons-color,
238             @_icon-font-color-hover: @primary__color, 239             @_icon-font-color-hover: @primary__color,
239             @_icon-font-color-active: @minicart-icons-color 240             @_icon-font-color-active: @minicart-icons-color
240             ); 241             );
241         } 242         }
242     } 243     }
243 } 244 }
244  245 
245 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { 246 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
246     .wishlist-index-index { 247     .wishlist-index-index {
247         .products-grid { 248         .products-grid {
248             .product-item { 249             .product-item {
249                 margin-bottom: 20px; 250                 margin-bottom: 20px;
250                 width: 50%; 251                 width: 50%;
251             } 252             }
252             .product-item-actions { 253             .product-item-actions {
253                 margin: 0; 254                 margin: 0;
254             } 255             }
255         } 256         }
256     } 257     }
257 } 258 }
258  259 
259 // 260 //
260 //  Desktop 261 //  Desktop
261 //  _____________________________________________ 262 //  _____________________________________________
262  263 
263 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 264 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
264     .products-grid.wishlist { 265     .products-grid.wishlist {
265         .product { 266         .product {
266             &-item { 267             &-item {
267                 &-info { 268                 &-info {
268                     &:hover { 269                     &:hover {
269                         .product-item-inner { 270                         .product-item-inner {
270                             display: block; 271                             display: block;
271                         } 272                         }
272                     } 273                     }
273                 } 274                 }
274                 &-tooltip { 275                 &-tooltip {
275                     display: inline-block; 276                     display: inline-block;
276                 } 277                 }
277                 &-actions { 278                 &-actions {
278                     margin: @indent__s 0 0; 279                     margin: @indent__s 0 0;
279                     > * { 280                     > * {
280                         display: inline-block; 281                         display: inline-block;
281                         margin-bottom: 7px; 282                         margin-bottom: 7px;
282                         margin-top: 7px; 283                         margin-top: 7px;
283                     } 284                     }
284                 } 285                 }
285                 .fieldset { 286                 .fieldset {
286                     display: table; 287                     display: table;
287                     .field.qty, 288                     .field.qty,
288                     .product-item-actions { 289                     .product-item-actions {
289                         display: table-cell; 290                         display: table-cell;
290                         vertical-align: bottom; 291                         vertical-align: bottom;
291                     } 292                     }
292                     .field.qty { 293                     .field.qty {
293                         padding-right: @indent__s; 294                         padding-right: @indent__s;
294                     } 295                     }
295                 } 296                 }
296                 .box-tocart { 297                 .box-tocart {
297                     .actions-primary { 298                     .actions-primary {
298                         margin: 0; 299                         margin: 0;
299                     } 300                     }
300                     .stock { 301                     .stock {
301                         margin: @indent__base 0 0; 302                         margin: @indent__base 0 0;
302                     } 303                     }
303                 } 304                 }
304                 .tocart { 305                 .tocart {
305                     width: auto; 306                     width: auto;
306                 } 307                 }
307             } 308             }
308         } 309         }
309     } 310     }
310     .wishlist-index-index { 311     .wishlist-index-index {
311         .product-item-info { 312         .product-item-info {
312             width: auto; 313             width: auto;
313         } 314         }
314     } 315     }
315 } 316 }
316  317 
317 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 318 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
318     .wishlist-index-index { 319     .wishlist-index-index {
319         .product-item-inner { 320         .product-item-inner {
320             padding: 0 0 9px; 321             padding: 0 0 9px;
321         } 322         }
322     } 323     }
323 } 324 }
324  325 
325 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { 326 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
326     .wishlist-index-index { 327     .wishlist-index-index {
327         .products-grid { 328         .products-grid {
328             .product-items { 329             .product-items {
329                 margin: 0; 330                 margin: 0;
330             } 331             }
331             .product-item { 332             .product-item {
332                 margin-bottom: @indent__base; 333                 margin-bottom: @indent__base;
333                 margin-left: calc(~"(100% - 4 * 24%) / 3"); 334                 margin-left: calc(~"(100% - 4 * 24%) / 3");
334                 padding: 0; 335                 padding: 0;
335                 width: 24.439%; 336                 width: 24.439%;
336                 &:nth-child(4n+1) { 337                 &:nth-child(4n+1) {
337                     margin-left: 0; 338                     margin-left: 0;
338                 } 339                 }
339             } 340             }
340         } 341         }
341     } 342     }
342 } 343 }